Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Fri, 8 Jan 2010 14:31:37 +0000 (22:31 +0800)
committerJason Rumney <jasonr@gnu.org>
Fri, 8 Jan 2010 14:31:37 +0000 (22:31 +0800)
commit4fffb778525b583896b3da0864c4f8cf568c1fac
treed3d4ed107306dbf96697a615359d782c1b9638dc
parent3f5620311ba3da207d6e25141f4102fc230ef006
parent97253d0bd7c1269b2db1eb77d53674a5d204c807
Merge from trunk